From 64a80eb8d8ba31e0082620dd41fc9257780045c4 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 27 Jul 2019 20:33:41 +0100 Subject: [PATCH] Mark patches as applied upstream --- debian/changelog | 6 ++++++ ...-Move-third-party-libraries-from-Libs-to-Libs.priv.patch | 2 ++ ...te-Remove-dangling-references-to-box-packing-tests.patch | 2 ++ 3 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 418b899bcb..42fcdce36a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gtk+4.0 (3.96.0-2) UNRELEASED; urgency=medium + + * Mark patches as applied upstream + + -- Simon McVittie Sat, 27 Jul 2019 20:33:30 +0100 + gtk+4.0 (3.96.0-1) experimental; urgency=medium * Team upload diff --git a/debian/patches/gtk4.pc-Move-third-party-libraries-from-Libs-to-Libs.priv.patch b/debian/patches/gtk4.pc-Move-third-party-libraries-from-Libs-to-Libs.priv.patch index 59405daec2..244acd2c8c 100644 --- a/debian/patches/gtk4.pc-Move-third-party-libraries-from-Libs-to-Libs.priv.patch +++ b/debian/patches/gtk4.pc-Move-third-party-libraries-from-Libs-to-Libs.priv.patch @@ -11,6 +11,8 @@ shared libraries, in which case pkg-config should be built with --enable-indirect-deps). Signed-off-by: Simon McVittie +Forwarded: https://gitlab.gnome.org/GNOME/gtk/merge_requests/998 +Applied-upstream: 3.97.0, commit:01a6bbdc738c3a61f5806b977e2cd9911f71507d --- gtk4.pc.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/patches/testsuite-Remove-dangling-references-to-box-packing-tests.patch b/debian/patches/testsuite-Remove-dangling-references-to-box-packing-tests.patch index df316cd93f..3dbf26f3d3 100644 --- a/debian/patches/testsuite-Remove-dangling-references-to-box-packing-tests.patch +++ b/debian/patches/testsuite-Remove-dangling-references-to-box-packing-tests.patch @@ -5,6 +5,8 @@ Subject: testsuite: Remove dangling references to box-packing tests These were removed in commit c47abb5f, before 3.96.0. Signed-off-by: Simon McVittie +Forwarded: https://gitlab.gnome.org/GNOME/gtk/merge_requests/997 +Applied-upstream: 3.97.0, commit:5cfe9ab6033f85a8cd9d6eef541427f4fd0efc74 --- testsuite/css/nodes/meson.build | 4 ---- 1 file changed, 4 deletions(-) -- 2.30.2